Merge "Switch Angler to HWC2on1Adapter"