Merge "Use default color when artwork is too small" into rvc-qpr-dev