Merge "Add Null checks to NavigationBarView" into rvc-dev