am d6a7925d: Merge "Updates to remote control client (un)registration"

* commit 'd6a7925d14231c016e84db53fb5a5bbab5a07d84':
  Updates to remote control client (un)registration