Merge "Update trendy teams for MediaProjection unit tests, so bugs come to us" into main