Merge "Change NVHM protection from crash to Log.wtf" into qt-dev