Fixed layout controls so they remove their debugging borders from the shape manager when destroyed