Merge "Fix battery usage screen issues" into mnc-dev