Merge "Make some Settings intent filters cross-profile again." into nyc-dev