Merge "Call removeOverlayView() before onRelease()" into lmp-dev