Correctly preserve state on orientation changes

Bug: 3049975
3 files changed