Merge "Address multiple RemoteControlDisplay competing for registration"