Merge "Sanity check padding/delay values for gapless playback" into klp-dev