Merge "display: config: Set vendor prop to disable 3d-tonemap on UI"