Merge "display: Fix display config version overwrite"