Merge "Settings: Add screen color settings" into kk