Merge "Split ImagePreviewView into an interface and an implementation" into tm-qpr-dev