Merge "SF: Move config of HWComposer to setupHwComposer"