am e6ce2405: 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 'e6ce2405a578d5eab2c461ec7cb90eadd33f1a8f':
  Save and restore the correct content type when rotating while in AllApps.