Merge "Clean up some unnecessary methods of ActivityRecord" into main