Merge "Fix re-registering PositionUpdateListener" into tm-dev