Merge "Allow power button to close an input method am: d28e9071 am: fed8c7dc" into nyc-mr2-dev-plus-aosp