Merge "Clear mAddingToTaskFragment when ActivityStarter is reset" into tm-qpr-dev