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

Change-Id: I627188ee2622c30d8f65debe7c350c1c25309acf