Merge "Refactor HWC2on1Adapter"