Merge "FP2-1524:The charge icon didn't display charging when change USB connection type" into fp2-dev-v2