Merge "Updated strings for dynamic privacy" into qt-dev