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

Change-Id: I86b352ed009cf2889974d724a4cf8daf41fb61d7