Merge "Add a music apps view to the Storage Settings."