Merge "Allow visibility to one more activity-related API." into main