Merge "Rev up vr_hwc to composer@2.3"