Merge "Fix TestUnfoldProgressListener when there are no progress" into tm-qpr-dev