Merge "Moved urlBarResourceId from autofill service manifest to whitelist settings." into pi-dev