Merge "Add ActivityCallerState owners" into main