Fix for media upload state methods
Bugfix for media upload spinner not refreshing.
Limiting the maximum number of pictures selected in the media picker to 4
Merge branch 'release/4.2' of github.com:wordpress-mobile/WordPress-iOS into issue/media-upload-fixes

* 'release/4.2' of github.com:wordpress-mobile/WordPress-iOS:
  Convert blogid to number for new sites
Simplified asset selection max
Merge pull request #2053 from wordpress-mobile/issue/media-upload-fixes

Media upload fixes