Merge "Unit test code for onCallStates change crash issue" into main