Merge "charger: minui error handling fixups"