Merge "check for null listenerInfo for drag&drop" into sc-v2-dev