Merge "Keystore 2.0: Add watch points to async_task.rs"