Three quick fixes

Removed commented out stuff in fragment_favorites.xml
Changed thermostat code to match thermostat view screen in
RoomDevicesScreen and FavoritesFragment