 * Fix return to previous keyboard #2529
 * Fix keyboard view update #2539
