Merge "Refactor screenshot logging in case of external display" into main