Merge "Removed references to ActivityRecord and TaskRecord in AM (24/n)"