Merge "Add navigation mode to Settings.Secure" into qt-dev