Bug 970936 - Fix intermittent failure in test_gallery_empty.py
Merge pull request #16174 from viorelaioia/bug_970936

Bug 970936 - Fix intermittent failure in test_gallery_empty.py
Bug 948363 - Music application: handle data transfer. r=dkuo