Merge "Make MediaRouter ignore remembered wifi displays when wifi display is off" into jb-mr2-dev