Fix crash when number of sections change between edits

Bug: 64282
Change-Id: I83af583a625aadaa9ca57062586fdf10c08231fe
Amend crash report dialog text to be less cute

Change-Id: I0630be624dce68a5cd8f9daf6c3d9000775974a7