Merge "avoid resetting mExpectRetrograde when deltaHalPosition == 0" into 24D1-dev