Merge "Add back auto-completion and auto-fill."