Merge "nuplayer: fix setting/finding buffer mismatch"