Merge "Fix up interractions between Adjust for IME and minimize" into rvc-dev am: d3bd995b am: aa1b6bbc Change-Id: Iec52d949400a4b6a071cb915bc33f61339510c42