Merge "[automerger skipped] Merge "[Graphics] Align Display P3 transfer function coefficients." am: fde18fac am: bc56d73a am: 93cd653b -s ours"