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

Change-Id: I717e03ac52383494403aaaf886e970d86bb3f3e2