Merge "Prevent NPE when resetting divider bar visibility" into sc-v2-dev am: 5a25696bfd

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15472699

Change-Id: Id99dd83824f2ebcbf80428f7877d9713a757d3a1