* commit '521eeaefcb4b78a8b571d1a1b4f095d993aea8b6': Make MediaRouter ignore remembered wifi displays when wifi display is off
* commit '521eeaefcb4b78a8b571d1a1b4f095d993aea8b6': Make MediaRouter ignore remembered wifi displays when wifi display is off