[DF-1128] add save logic and small fix in filpath
Merge remote-tracking branch 'origin/DF-1206_UDID' into DF-1206_UDID
[DF-1206] refactor ios and mac implementation