Merge "Add RESTRICTED_ALLOWED_APPS setting"