Merge "MediaRouter/Wireless Display - correct initial state" into jb-mr1-dev