Merge "fix a small bug that caused screenshot to show garbage in some cases"