Merge "Fix flaky test BlockListPagerTest::testFormatValue"