Merge "Consider folder diff differently" into ub-launcher3-rvc-dev am: 3b18d41e2c

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

Change-Id: I8548df3271aa23c13e57fffede5ccd1d038a585b