Merge "[Ongoing Call Chip] Keep chip displayed on theme change." into sc-dev