Merge "Update redaction upon profile changes" into qt-dev