am bacb5422: Merge "Also rely on enabled notification listeners for RemoteController registration" into klp-dev

* commit 'bacb5422bc4670d2b8905d9f58d068a97836561f':
  Also rely on enabled notification listeners for RemoteController registration