Merge "Allow power button to close an input method" into cw-f-dev
am: 33d498b946

Change-Id: I16d09e41f6804d0f5bd68b02e019a2d258c792f3