Merge "sf: Fix to allow hwc composition through property"