Merge "Remove outdated TODO in MediaSession2Record" into main