Merge "GLConsumer: Fix crop math" into mnc-dev