Merge "nuplayer: don\'t resume if player is reseting" am: c5ea4edcd4
am: c24b47c33d

* commit 'c24b47c33d9f250972a570a9ff22920f98d3c732':
  nuplayer: don't resume if player is reseting