Merge "Fix crash with null recent folders uri"