Merge "Fix CDMA Call Forwarding/Call Waiting UI" into sc-dev