Merge "Avoid saving position before minimizing when in transition" into oc-mr1-dev