CMS-1292: Live Edit: Improve drop before/after target component