Merge "Revert "Allow screenshot to carry more information.""