Merge "Fixed that call forwarding icon not shown issue"