Merge "Improve the UI layout of the input screen" am: 58cf752ac5 am: 492789375a
am: ae3c6d6961

Change-Id: I42f8738b0e903e3f5890985c60aef55f662aae49