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

Change-Id: I3bd17c3e7f34b1c9453d5cae265477429b812630