Merge "Catch all exceptions when loading images" into main