Merge "charger: accomodate minui change" into jb-mr2-dev