Merge "Fix bug for direct track with PCM != 16-bit"