Merge "Add carrier config variable to hide merge call button" into mnc-dr-dev