Merge "QS tile transition fixes." into pi-dev am: 600fe676f7
am: 959986325c

Change-Id: I6ba5b08e69c00ad456de9a84dbfd46256d59e6e2