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