Merge "Merge "Allow power button to close an input method" into cw-f-dev am: 33d498b9 am: 5544461b" into nyc-mr2-dev-plus-aosp