Merge "Merge "Fixed a bug where the panel could be stuck" into oc-dev am: e8dceabd98 am: 3a18b28ab0" into oc-dr1-dev-plus-aosp