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

Change-Id: I46cffe55224ee5c7c58f794d802db7251e213ee8