Merge "Calculate ClearAllButton's scroll offset after it's laid out" into sc-dev