Merge "Speed up id3v2 unsynchronization"