Merge "Skip showing Call Forwarding fail-to-disable dialog"