Merge "Workspace pagination UI update" into tm-qpr-dev