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