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

* commit '33ac1218b93cb4fcaba398fd73f27dcc72dfede3':
  Fix RemoteController synchronization mode