Merge "Consider orientationHandler when calculating ClearAllButton scrollOffset" into sc-dev