Merge "Fixes divider position after minimizing and unminimizing with ime open" into oc-dev
am: 81a57133e8

Change-Id: I9d3f0778d8153dcf172e2dcd4b7b5653e94e6d62