Merge "Address dynamic activity policy API feedback" into main