Merge "Move prefer system ordering flag to builder constructor"