Merge "Add system_api_service to color_display_service"