Remove saving state from Toolbar am: cffd5ba0e5 am: 4cbfbdba11

Change-Id: I27f06a1e90f9fb989bbf641b57ed7c90d8bce555