Merge "Fix battery tip app name is empty"