Merge "Add loading state to the image preview UI" into udc-qpr-dev