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

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