Merge "Fix QS tiles not rippling" into oc-dev