Cleanup on save dialog cruft & fix updateWatchLink

Change-Id: I730003726db0164e1bef8bddcd45e31df1373618
Merge "Cleanup on save dialog cruft & fix updateWatchLink"