Merge "QS tile transition fixes." into pi-dev