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

* commit 'fb0b6a817903b42dfc192dc8fa71f5dede024379':
  Opt-in mechanism for RemoteControlClient position anti-drift check