Merge "Update QS rotation tile text to display when smart-auto-rotate is enabled"