Merge "Fixing stroked qs tile" into rvc-dev am: 830401575b

Change-Id: I657ee31e1736a6ae933945290469b5cbd2a6e967