Merge "Merge "Fixed a bug where the panel could be stuck" into oc-dev am:...
Merge "Merge "Fixed a bug where the panel could be stuck" into oc-dev am: e8dceabd am: 3a18b28a" into oc-dr1-dev-plus-aosp
am: 0b8e969f
Change-Id: I4b4138231d1368068b2e32ef218cbd5d0e4740b2