Merge "callforwarding: Fix duplicated error popup" am: b22401b950 am: fb7b3511e3

Change-Id: Id7b5dc1ed8a17d6198d021c3c4467fae0fc1a0f8