Merge "Enable showing forwarded number"