am d18920f5: am d9b09fa9: Merge "Fix registerListener and flush bugs." into klp-dev

* commit 'd18920f5c9c3f4662ceb8f729805ae06761cf108':
  Fix registerListener and flush bugs.