Merge "Replace the no calling icon" into sc-dev