Merge "display: Change the place to set color mode" into display.lnx.6.0