Merge changes If5b85fd1,I1dfde979

* changes:
  Keystore 2.0: Add more watch points.
  Keystore 2.0: Add watch points in database.rs and legacy_migrator.rs