Merge "Prevent NPE when registering a remote control client"