Merge "Make switchToSubscription use PendingIntent"