Merge "Fixed an issue where heads up where invisible in qs edit" into oc-dev