Revert "Revert "Merge pull request #2597 from redconfetti/CLC-3649-cp-spinner-on-load""

This reverts commit 2981c5a4d51b9fc9c73d92da0303a726ff039020.