Fix merge conflicts
- Remove for now WifiDisplay Tile
- Fix recents