DO NOT MERGE: Fix top_controls_manager to stay hidden

cc/input/top_controls_manager.cc

Index: cc/input/top_controls_manager.cc
diff --git a/cc/input/top_controls_manager.cc b/cc/input/top_controls_manager.cc
index 1615d7f2d3875e4766bb55f884e166caa7d380b9..f0f4ba992898e1e9d64b055a5f0edfe853763cf3 100644
--- a/cc/input/top_controls_manager.cc
+++ b/cc/input/top_controls_manager.cc
@@ -167,6 +167,11 @@ void TopControlsManager::SetTopControlsHeight(float top_controls_height) {
   ResetAnimations();
   float top_controls_offset = client_->ControlsTopOffset();
   top_controls_height_ = top_controls_height;
+
+  // Stay hidden if only HIDDEN state is permitted.
+  if (permitted_state_ == HIDDEN)
+    top_controls_offset = -top_controls_height_;
+
   SetControlsTopOffset(top_controls_offset);
   StartAnimationIfNecessary();
 }