Merge "Fix RemoteController synchronization mode" into klp-dev