Merge "Use a selector instead of loading resource for drop target." into sc-dev