Merge "Notify client to clear intermediate rotated adjustments" into sc-dev