Merge "Fix App name and icon in Settings Battery details."