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

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