ComponentContainer drag drop issue fix