Merge "Fix 5242200 only update RemoteControlDisplay when a client is present"