CMS-3805 Live Edit - Component select and de-select adjustments