Merge "Fix QS label layout" into oc-dev