Merge "Merge "DO NOT MERGE Ensure minimized state is false when dock is gone...
Merge "Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists change" into oc-dr1-dev am: 407c4c57" into oc-dr1-dev-plus-aosp
am: 320c4039
Change-Id: I5199361a5563e479c07f0d41ad16ea1f9c7a200b