b/3395742 Clean up restore on rotation

Ensures we stay in the same view when rotating and cleans up
a field we were saving that isn't used anymore.

Change-Id: I3761ef9a71eec287308b56beedeb01e6366d81a7
1 file changed