Merge "Fix CTS issue on PRIVACY_SETTINGS" into qt-dev