Merge "Use different "None" strings for Messages and Calls in Modes breakthrough" into main