Merge "Vertically stack AlertDialog buttons when necessary (1/2)" into main