Fixed upload file count being wrong in Add Media page (lemma to CC-5863)
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas