Move toolbar updateState code into separate method

So that it can be called on intialize without a contextChange.

Change-Id: I2a3fa78b07dadd31963ff716339da5f7b75ff157
Merge "Move toolbar updateState code into separate method"