Merge "Disable navbar contrast for ThemedNavBarKeyboard" into qt-dev
am: 0caa955119

Change-Id: I3caf78ebeac86a67e78b90574f1dbc55607d65cc