Merge "Add NEW_TASK flag for intents that leave Settings" into sc-v2-dev