Merge "Add timeout for ImsState callback" into main