Merge "Include injected settings for selected profiles only" into main