Fix a bug which broke the battery charging flow from solar#833

re-ynd wants to merge 2 commits intoflixlix:mainflixlix/power-flow-card-plus:mainfrom

re-ynd:fix_782re-ynd/power-flow-card-plus:fix_782Copy head branch name to clipboard