Merge "Fix RTL drawing for QS tiles in edit mode" into oc-dr1-dev