Merge "Rename call forwarding related constants"