Merge changes I30701af5,I204198b1 into main

* changes:
  Clean up HAL render position reporting
  avoid resetting mExpectRetrograde when deltaHalPosition == 0