Merge "Fix flaky rollback browser test"