Merge "Guard textureId during CheckForWaitingTexture" into devel/master