Merge "Tweak live tile rotation handling" into sc-dev