Fix a couple issues with sticky headers

ash/common/system/chromeos/network/vpn_list_view.cc

Index: ash/common/system/chromeos/network/vpn_list_view.cc
diff --git a/ash/common/system/chromeos/network/vpn_list_view.cc b/ash/common/system/chromeos/network/vpn_list_view.cc
index ff8ee0ae58696cf83dd3754daee84a8be1b21398..1ad16295a8194ddb7a5412a7f6ee0894839be793 100644
--- a/ash/common/system/chromeos/network/vpn_list_view.cc
+++ b/ash/common/system/chromeos/network/vpn_list_view.cc
@@ -296,8 +296,10 @@ void VPNListView::Update() {
   provider_view_key_map_.clear();
   network_view_service_path_map_.clear();
   list_empty_ = true;
-  container()->SetLayoutManager(
-      new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
+  if (!UseMd()) {
+    container()->SetLayoutManager(

[Evan Stade, 2016/11/11 23:42:45]

this was the source of the crash --- container() is the scroll contents. I
haven't the slightest clue why the normal layout manager is being overridden
here.

[tdanderson, 2016/11/12 01:45:21]

Acknowledged.

+        new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
+  }
 
   // Get the list of available VPN networks, in shill's priority order.
   chromeos::NetworkStateHandler::NetworkStateList networks;