Merge "Increase time buffer to reduce flakiness in filter age test" into main