Merge "Revert "Update clearData flow for notification settings"" into qt-dev