Merge "Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists change" into oc-dr1-dev am: 407c4c5719" into oc-dr1-dev-plus-aosp