Merge "Improve backup and restore for empty sounds"