Merge "Revert "Allow power button to close an input method"" into nyc-mr2-dev