am 340ccfe0: Merge "glFinish to flush deletes" into lmp-dev

* commit '340ccfe0fc65803b56d68c2b067a5198c14d0f6f':
  glFinish to flush deletes