Merge changes from topic "pendingIntent-switchToSub"

* changes:
  Make switchToSubscription use PendingIntent
  Do not use portIndex API until implemented