LPS-51667 Make content independent from layouts when export or publishing

peer reviewed by @danielkocsis

cc: @epgarcia