Merge "Music: Fix crash caused by OutOfBoundsException"