Merge "Accounting for image scaling when calculating color extraction" into sc-qpr1-dev