Merge proposals dependent on lp:~aacid/autopilot/keyboard_when_needed

lp:~aacid/autopilot/keyboard_when_needed has no merge proposals.