Media upload fixes

Some quick fixes to combat some media upload crashers we have been seeing in 4.1.3. Includes:

* Limiting the number of pictures a user can upload at one time to 4
* Refreshing the UI on the main thread