Reset claimgroup when cancelling edit

Change-Id: I992af5f16aaa4212b02bba2fe8a634fbdd632bc1
Merge "Reset claimgroup when cancelling edit"