Merge "Save state, and restore when back from back stack" into sc-dev