Merge "Restore NuPlayer error and EOS handling" into klp-dev