Merge "Use return switch expressions in MediaSessionRecord" into main