Merge "Support gapless playback for mp3 and m4a"