Merge "MediaRouter2: Fix test bug"