Added code to do auto save after choosing from the popup tree when triggered via the save button

Reviewer: Dan V (post commit)

Issue: GCp-9581