Merge "Fix qs tile drawing in edit QS panel" into oc-dr1-dev am: 31ff02ecd2
am: 8154057746

Change-Id: I5296fc15a424ea10f41edb4fc544f711a5d65d6c