Merge "Make colorContrast setting dependent on framework value" into main