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