Merge "fix deep buffer logic in NuPlayer." into lmp-mr1-dev