Merge "Ensure we get the right nav bar mode for the current user in the system" into qt-dev