Merge "Merge "Avoid saving position before minimizing when in transition" into oc-mr1-dev am: 33b1e1fe4d am: f42bf5904b"