Merge "Config change to not show swap button after merging calls into Cdma conference." into lmp-mr1-dev