Merge "Revert "Remove "Backup Calling" button from Settings UI""