Merge "Update INVALID_LAYER_STACK naming" into main