Merge "Add back NEW_TASK flag." into honeycomb