Merge "Fix failed test case for BatteryTip in Settings" into main