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

* commit '3260f254459fab42fb23389088da0eb73e0e0969':
  Fix RemoteController synchronization mode