Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev