Merge "Merge "Fix IME displayed behind the notification shade" into pi-dev am: c0797c85e9" into pi-dev-plus-aosp
am: 521450a50c

Change-Id: Ib8bbcd4c934348e0e688c331b90c2c49d445ba0e