Merge "Prevent NPE in NavigationBar" into sc-v2-dev