Merge "Fix 5243349 RemoteControlDisplay incorrectly updated"