Merge changes I396c2cb2,If04eb5ab

* changes:
  Implement filtering for Inline Autofill.
  Some cleanup for autofill.Session.updateLocked()