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

Change-Id: Ic6e6a564d6998c5876a6855f4edbb436e6dcfad1