Merge "Use different slots for no_calling and call_strength icons" into sc-dev