Merge changes Iecf8b207,I2f2a05ef into pi-dev

* changes:
  Make MP2.prepare|play handled with task queue
  Remove unused imports in MediaPlayer2.