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

* commit '6c506aacb2015fd23487a4aa48cbb276ad40cc3a':
  Fix RemoteController synchronization mode