Merge "Fixed an issue where the qs panel wasn't properly placed" into oc-dr1-dev