Merge "Updates to remote control client (un)registration"