am 90bd7338: Merge change 2075 into donut

Merge commit '90bd7338df76c0a6185f4ff2fe7f981fa1a1d36c'

* commit '90bd7338df76c0a6185f4ff2fe7f981fa1a1d36c':
  Fix bad filtering of error code when set_position_mode() is being called.