Merge "Layer input method on top while transitioning." into pi-dev am: e47deacaab
am: 4d7b702abe

Change-Id: Ifedb1ff82143dfc4ed70f3ca6b4d4a86c0ed4b26