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