Merge "Fix bugs in cast QS tile" into oc-dev
am: 03e920f3e9

Change-Id: Ia953f48fe08bd8058cbc9e9bce1ab7466d03aa29