Merge "Remove FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET"