am fe6d7775: 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 'fe6d777517c162a04f8f446ff3b7b0eb383f1e98':