Merge "Add AppFunction entry for privacy settings" into main