Merge "Rename focusGrantToken to inputTransferToken" into main