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