Merge remote-tracking branch 'origin/feature/17621-keep-latest-screenshot' into stable (Closes: #17621)