Save dialog when necessary if going to progress activity
Merge remote-tracking branch 'origin/development' into development