Merge "Remove VAO cache if invalidate pipeline" into devel/master