Merge "Fix NPE from NavbarButtonsViewController on FEATURE_PC devices." into main