Merge pull request #7703 from jaoo/827282

Bug 827282 - [Call Forwarding] Settings app shows out of sync info about...