Merge "Revert "SF: Use CompositionInfo to program HWComposer""