Merge "Fix test failures when footer flag is enabled." into main