Merge "Add ColorDisplayServiceInternal local service"