am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev

* commit '617e715a40e2867c0b30d1bae38c20815ee30071':
  Fix RemoteController synchronization mode