Seperate the various media types, allowing them to fail/timeout independently. Also opens up the possibility of asserting file counts for each type.
Remove uneccessary second call to get all media
Avoid overriding the script timeout when restarting B2G