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