Only user the server-based upload speed testing, if the app specifically allows it.
Moved some key properties from raw/properties, to app methods, to make them easier to find.