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