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