Merge "Add state save/restore for Toolbar" into lmp-dev