Merge "Remove package name from SafetyNet logs" into qt-dev