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

Change-Id: I129f1939631a38b2aa51659e9ff4207404416398