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