Merge "sf: vds: Avoid HWC for certain scenarios"