Merge "Clean up NotificationScrollViewModel.expandFraction" into main