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

Change-Id: Ic428d2e26e587a4ec80b3ecd95a54f195d2929d2