Merge "Remove dead code for back screenshot" into main