Merge "Revert^2 "Ignore failing test cases in BatterTipsCardPreferenceTest"" into main