Merge "Clear icon after temporary error" into udc-qpr-dev