Merge "Remove Automatic color mode option" into pi-dev