Merge "Add MiniFence to drop HWC2on1Adapter libui dep"