Freeze actions while image uploading is in progress (fixed)

Fixing issue #640 
Resubmit of #641, #642 (guildline reasons)
[finally I solved the issues with my branches, sorry]