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