Merge "Disable navbar contrast for ThemedNavBarKeyboard" into qt-dev