Merge "Hide Autofill UI when non-savable id is gone." into oc-dev