Merge "Fix flaky navBar test in CTS"