am 604b2d99: Merge "b/3030552 Move view type saving code to onResume - do not merge" into gingerbread

Merge commit '604b2d999d1064f8549f86cb910582df2310a01a' into gingerbread-plus-aosp

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