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

Change-Id: I00ea048b80625dfeda1ca532d4b7c90f3e57b96f