Merge "SF: Fix color transform for composited virtual displays" into rvc-dev am: fce46c19d1 am: 609a5b1335 am: fab2171a2b am: 0a9e79f02e

Change-Id: I6f88e9b8e78c7f83037536c9b4905f515e162c91