Merge "Fix updatescreenshot behavior"