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

Change-Id: I8d70288c8c196085b745469ba689884eeeb2c82d