Merge "Screenshots logging update"