Merge "Use EXPECT_NEAR for float values in expectTap" into main