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