Add reset method to toolbar

Make toolbar resetting code reusable.

Change-Id: I4e796309fc721622c313f6ec5121b4d011c25c51
Merge "Add reset method to toolbar"