Merge "Adjust display inversion matrix to account for luminance"