Merge "Block voice calls" into main