Merge "Replace AlertController with AlertDialog" into main