Merge "Do not append NEW_TASK flag when caller activity is finishing" into tm-qpr-dev