Merge "Persist docked state so it doesn't get lost in re-inflates" into oc-mr1-dev