Merge "Fix navigation bar flaky tests"