Merge "Fix empty CompositePositionUpdateListener"