layout: Remove sub_object_add_enable
Same as the previous patch. This was an ugly hack. Use another one instead.
Ref T5315