LILY-323: Fix back button for contact edit/add form
LILY-323: Fix back button for contact edit/add form
Merge branch 'feature/LILY-323-fix-contact-back-button' into develop