Merge "SF: Fix color transform for composited virtual displays" into rvc-dev am: fce46c19d1

Change-Id: I3bf3b071efe88aa4276ba7eed66f7f1e4cb7e377