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