[Contextual Search] Remove layers when no longer needed.

chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java
index 1cba75a1a3f7c657d518de31a1fc1c1934fcafbd..4115446862cdba81ed9a701164a4d7efedfb7388 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java
@@ -254,6 +254,16 @@ public class StaticLayout extends ContextualSearchSupportedLayout {
     }
 
     @Override
+    public void detachViews() {
+        // TODO(pedrosimonetti): Find a better place to put this code. We need to remove
+        // the content scene layer every time the StaticLayout is being hidden, but currently
+        // the startHiding()/doneHiding() methods are not being called in this case. Ideally,
+        // those methods would always be called when a layout is being hidden, and then we could
+        // override one of them instead of overriding the detachViews().
+        mSceneLayer.setContentSceneLayer(null);
+    }
+
+    @Override
     public void destroy() {
         if (mSceneLayer != null) {
             mSceneLayer.destroy();