Merge "Fix crash when opening with directories." into arc-apps