Merge "Remove carrier prefix before displaying emergency numbers" into sc-dev