Merge "Fix qs tile drawing in edit QS panel" into oc-dr1-dev