Merge "Add gapless playback support for NuPlayer"