Merge "GUP: Add global switch for all apps"