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

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