Merge "Fix NavigationBarColorTest" into rvc-dev