Merge "Rely on ConversationPositionTracker to calculate position" into jb-dev