Site Template - Folder is always propagated to the Site not only at Site creation

• Type: Bug
• Status: Closed
• Resolution: Fixed
• Affects Version/s: 6.2.10 EE GA1, 6.2.X EE, 7.0.1 CE GA2, 7.0.0 DXP SP1, Master
• Fix Version/s: 7.0.0 DXP FP24, 7.0.X EE, 7.0.4 CE GA5, 7.1.X, Master
• Component/s: Documents & Media, Staging, Staging > Export/Import
• Labels:
  • liferay-digital-enterprise-70-sp5
  • liferay-fixpack-de-24-7010
• Branch Version/s:
  7.0.x
• Backported to Branch:
  Committed
• Story Points: 1
• Fix Priority: 3
• Git Pull Request: https://github.com/brianchandotcom/liferay-portal/pull/50164

Reproduction steps:

1. Create a Site Template
2. Create a Site from theTemplate
3. In theTemplate create a new Documents and Media Folder
4. Put a Documents and Media portlet to the Template's page and configure it's Root folder to the previously created folder
5. Go to the Site's page (this triggers the propagation)

Result:
The Folder was propagated to the Site

Contents should only propagated to the Site at Site creation.