Merge "Add flag for Preference Service Consent dialog" into main