Merge "Whitelist DISPLAY_COLOR_MODE setting for B&R" into pi-dev