Merge "Fixed an issue where the panel could be stuck tracking" into oc-dev