Merge "Fix handling of bad image previews." into rvc-qpr-dev