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