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

Change-Id: I8f6b3e2f853ff5a066de02ae0a006ebb4f157078