Merge "Revert^2 "Simplify MediaSessionRecord callback invocations"" into main