Merge "Don't double-apply display color transform" into tm-dev