Merge "Music: workaround media provider crash"