Merge "Support incompatible charger state in the Settings main page" into udc-dev