Merge "Refactor in PositionTesterContextMenuListener."