Temp: Remove WifiDisplayTile
Fix merge conflicts