am 172b1e24: am 477f9cd5: am 81134796: Fix leak when receiving multiple surface changed messages, typically when exiting a landscape app.

Merge commit '172b1e24a3f2d775f7721ff33751773a59c68a4d'

* commit '172b1e24a3f2d775f7721ff33751773a59c68a4d':
  Fix leak when receiving multiple surface changed messages, typically when exiting a landscape app.