Merge "Do not set the divider pos during adjust ime and minimized interaction" into oc-dev