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