Merge "Improve ID3V2.4 handling unsynchronization"