Merge "Create TaskOperations when shell transition is off" into tm-qpr-dev