Merge "Add default URL bar resource id for autofill compat mode." into pi-dev