Merge "Remove tracking of all drawables in ViewOverlay.clear()" into nyc-dev
am: a487ab1368

* commit 'a487ab13682d6e60c6ff41a5b9f708b752efc776':
  Remove tracking of all drawables in ViewOverlay.clear()