Merge "Separate privapp grant for settings.intelligence"