Urban Infill and Revitalization of Al-Rayan Corridor in Doha, Qatar: Land Use and Design Plan