am 498c84e7: Merge "Don\'t wipe out explicit Toolbar nav icon when calling...
am 498c84e7: Merge "Don\'t wipe out explicit Toolbar nav icon when calling setSupportActionBar" into lmp-mr1-dev
* commit '498c84e7':
Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar