Merge "Battery summary - tint uid 0 icon" into mnc-dev