Merge "Revert "Adding screenshot tests to postsubmit."" into main