Merge "Add COLOR_MODE_AUTOMATIC" into pi-dev