Merge "Ensure the no calling icon is not ignored" into sc-dev