am 2a96fc1f: Merge "Fix RemoteController update in RemoteControlClient registration" into klp-dev

* commit '2a96fc1f516f7ac7fcbf5bd8c8c4fe8c7b2a8a7f':
  Fix RemoteController update in RemoteControlClient registration