Merge "Make Toolbar$SavedState accessible" into lmp-mr1-ub-dev