Merge "Fix the bottom row of tablet keyboard layout" into lmp-dev