Merge "Fix bug of secondary call info disappear after switching calls." into nyc-dev