Merge "Fix RemoteController update in RemoteControlClient registration" into klp-dev