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

Change-Id: Ie1dea52d7ca9ccc1d6b3da65c3dff18ef62670f8