Merge "Revert "Use GraphicBuffer instead of GBP for screenshots.""