Merge "Music: Fix crash caused by StaleDataException in monkey test"