title: Tool bar setNavigationOnClickListener breaks ActionbarDrawerToggle functionality
body: <p>I'm swapping out the action bar for the tool bar, and I nearly have every piece of the puzzle in place. My issue is specifically if I navigate 'up' and restore the navigation drawer, the drawer toggle button no longer works. I figured out if I set the drawer mode to unlocked I have the ability to swipe to open the drawer, but can't click to open the drawer. </p>
  
  <p>So I load fragment A, drawer behaviour is fine, go down to fragment B and apply the up icon, hit up to go back to A, and the drawer won't open with a click any more.</p>
  
  <p>Entering Fragment B:</p>
  
  <pre><code>Toolbar t = mHostingActivity.getToolbar();
          mHostingActivity.getDrawerToggle().setDrawerIndicatorEnabled(false);
          mHostingActivity.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
          t.setNavigationIcon(mHostingActivity.getV7DrawerToggleDelegate().getThemeUpIndicator());
          t.setNavigationOnClickListener(new View.OnClickListener() {
              @Override
              public void onClick(View v) {
                  popBackStackToTop(mHostingActivity);
              }
          });
  
  /**
   * Pop the back stack and hide the Up caret all the way to the top level of the {@link com.loylap.activities.MainActivity}
   *
   * @param activity our hosting activity
   */
  public static void popBackStackToTop(MainActivity activity) {
      if (activity != null) {
          FragmentManager fm = activity.getSupportFragmentManager();
          fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
          activity.getDrawerLayout().setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
          activity.getDrawerToggle().setDrawerIndicatorEnabled(true);
      }
  }
  </code></pre>
  
  <p>The navigation drawer is set up just like the sample, maybe the old way of setting up the options is the issue? For example, I still have this in my activity:</p>
  
  <pre><code>@Override
  public boolean onOptionsItemSelected(MenuItem item) {
      if (mDrawerToggle.onOptionsItemSelected(item)) {
          return true;
      }
  
      return super.onOptionsItemSelected(item);
  }
  </code></pre>
  
  <p>EDIT:</p>
  
  <p>Okay so I've narrowed down the issue to the setNavigationOnClickListener(). If I don't set this (and go up via back button) - the drawer behaves correctly. So now the question is how do I correctly allow the user to go 'up', and restore the click listener after to we do go up?</p>