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