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

Change-Id: I8c45b6cb87fcee0ffe8ad5948b1b82ca16d39912