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

Change-Id: Ibc059c21bd2776da65fc57cac6d8707882880a6c