Merge "Opt-in mechanism for RemoteControlClient position anti-drift check" into jb-mr2-dev