After Marshmallow update my Note 5 home screens keep resetting. No apps or data is lost, but it's happened 3x in the last week.

[Bulkmailman]

All my apps appear to have updated. But 3x this week, when I wake up in the morning, the 5 home screens I have set up (using original phone launcher) are back to the original 3, and all the folders with shortcuts to apps, etc., are gone. How do I set up app folders & shortcuts so they STAY and not disappear?