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

Change-Id: I2c900104e46a9a9c23a1faca89806f02924de7ec