Merge "Add config to use a display rule that ServiceState was considered"