Merge "Fix NPE in Call Forwarding Menu"