Restore dependency from build to layout
Remove layer set debugging code