Merge "Simplify MediaSessionRecord callback invocations" into main