Merge "Fix cut off charging indication in certain scripts" into mnc-dev