Merge "Revert "Take into account default app for default grants""