* commit 'd11e2b7cdd283ebfd2c41e7616a54bcc084d0a30': Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar
* commit 'd11e2b7cdd283ebfd2c41e7616a54bcc084d0a30': Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar