Merge "Screenshots cleanup: dead code removal"