Merge "GLConsumer: Fix unsigned subtraction during crop"