Merge "[Ongoing Call] Remove the call chip when #onEntryCleanUp is called." into sc-v2-dev