Merge "Address new activity control API feedback" into main