Merge "Update trendy team for mediaroutertest" into main