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

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