Correctly focus next claim's edit button when removing a claim

The change set solves an error caused when removing a claim not being the last within a claims section.

Change-Id: I3997608159651c4d800f12da797223a82efc7739
Merge "Correctly focus next claim's edit button when removing a claim"