Disabling the layer switch after popping the preferred layer, since it was preventing adjacent children from sharing
Fix for updating layer type + unit tests