Merge "Ensure MediaRouter correctly handles renamed Wifi displays." into jb-mr1-dev