Merge "Check for USAGE_FRONT_BUFFER after GPDIFP2" into main