Merge "Take into account default app for default grants"