Re-focus "add" button after having added/cancelled adding a claim

Change-Id: Iabf2c05b5e11801b582dfb99604ea9a69407d8e2
Merge "Re-focus "add" button after having added/cancelled adding a claim"