Merge "[W] Return CharSquence and int for onFailure callback" into main