Merge "Observe settings directly in ColorDisplayService"