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

Change-Id: I3264b0a59ab9ff1b4b1d9ac0e66236e83c1bacd6