am 67a66bd5: (-s ours) am 604b2d99: Merge "b/3030552 Move view type saving code to onResume - do not merge" into gingerbread

Merge commit '67a66bd59bf2a7ce51b949c16c2eba99baed11ff'

* commit '67a66bd59bf2a7ce51b949c16c2eba99baed11ff':
  b/3030552 Move view type saving code to onResume - do not merge