Merge "Fix order invariance when checking for GroupedTaskViews" into udc-qpr-dev