Merge "Fix RemoteController synchronization mode"