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

Change-Id: Ifca93313598b3f6c8d126691dca51f3c1a29d17e