Merge "Don't require BAL opt-in if not a PendingIntent" into main