Merge "Update the handleUpdateState() of Wallet Tile." into sc-dev