Merge "Retain the image loader through configuration change" into udc-dev