Merge "GLConsumer: Fix crop math"