Merge "Revert "Consolidate screenshot library.""