am be8ff1f4: am d7adbab6: Merge "Save and restore the correct content type when rotating while in AllApps." into jb-ub-now-jolly-elf

* commit 'be8ff1f4077c127933173dd292413d1b853052f8':
  Save and restore the correct content type when rotating while in AllApps.