Merge "Remove RWC#getActivityRecord" into main