Merge "Update NavigationBarControllerImplTest" into main