Merge "onDrawScrollIndicators returns early if the view isn't attached" into sc-dev