I have been following the recommendation from the xda forum for years - before every major OS update, and even with monthly security updates, I return all settings to their defaults - original theme, original font, original home screen, which means I remove all personalization. And I never have problems upgrading. After the upgrade I wiped the cache from recovery menu and that's it.
