Merge "Revert "hwc: avoid composition for static screen use-cases""