Merge "Fix some more divider/ime interractions" into rvc-dev am: df9ba578 am: 375a4018 am: 6c360ad4 Change-Id: I8d38d244a125d590d288c3ac5f1d619b6e068e86