Merge "Minimal change to ensure that position is last saved when docking." into oc-mr1-dev
am: 1ca7d06313

Change-Id: Ifd9843a433cadc7d0effa6783455e933ca5d2575