Merge "Making ActivityContext extend SavedStateRegistryOwner" into main