Merge the custom layout sections upon theme import (see #5000)