Merge "remove sensitive pii from safetynet logging" into qt-dev