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