Merge "Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar" into lmp-mr1-dev