Merge "Simplify NotificationScrollViewModel.expandFraction" into main