Merge "Fix crash when changing navigation modes" into qt-dev