am e1546df2: Merge "Fix message handling in RemoteControlClient" into jb-mr2-dev

* commit 'e1546df25a7de17195f5b38ca90cad8447c288d0':
  Fix message handling in RemoteControlClient