Merge "Consider folder diff differently" into ub-launcher3-rvc-dev