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

Change-Id: Ic7c0ffeb7f295c4161d01d7ad1d0ae2eae6d9f85