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