Merge changes Ie79a67d3,Ifb548a30

* changes:
  Adds displayId to android.app.TaskInfo
  Fixes missing FLAG_ACTIVIY_NEW_TASK in startActivity