Merge "Use new setupAppDir() API for creating app-specific directories."