Merge "Fix failed test in BatteryTipsCardPreferenceTest." into main