Merge "TIF: Fix current position not reported issue"