Merge "Avoid crash on Files app when creating a directory"