Merge "Revert "Switch Angler to HWC2on1Adapter""