Merge "Implementation of Dedicated card mode APIs changes (Discovery tech and Change Routing)" into main