Merge "Use compact battery status string if available (1/3)"