Bug 1042319 - [Gallery] Update gallery edit UI r=djf

yes, that's a miss, I have taken out cancel flow in a separate function to avoid calling this snippet of code if user cancels out of edit Tool.