Merge "Refactor in PositionTesterContextMenuListener." into froyo