Merge "Merge "Fix IME flickering when swiping out to home" into sc-qpr1-dev am: c300c9d7 am: 7c09504d" into sc-v2-dev-plus-aosp