Merge "Add Display Auto White Balance to ColorDisplayService"