Added conditional checking that trial should be saved first before we allow in line editing feature

GCP-10553

Reviewer: Daniel Villafuerte
Fixed the issue in Fieldmap where the selected value of the field location is removed after navigating back to the Enter Field Details page

GCP-10397

Reviwer: Daniel Jao
Merge branch 'master_dev'