Merge "Implement HWComposer 2.4"