Merge "Fix for Parametric stereo stream playback issue"