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

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