Merge "Fixing stroked qs tile" into rvc-dev