Merge "Check URI is valid for loading images" into rvc-dev