Merge "Fix the other app's scoped directory permissions are revoked"