Merge "Prevents screenshot layer from dismissing IME." into nyc-mr1-dev
am: a6b1a9485c

Change-Id: Ia176be1937adbd115acfece5979c3d61e1111d7d