Revert "Revert "Revert "Derp"""

This reverts commit 58a0a005d51b369b1e748c8a20d1ed5598ba42af.
Revert "Revert "Revert "move appbar for now"""

This reverts commit 69ca00cc4e5ac4d538008ce5fe9361538df88e88.
Revert "Revert "Revert "maybe a derp"""

This reverts commit 541e350c3085140f6a5255a5b76db366cd02076d.
Revert "Revert "Revert "Appbar changes to compile and work with new CM "Display Settings: Better font size control" commit"""

This reverts commit f1c8f057c44361f9dc16bb11decd8ea42c8f66b8.
Revert "Revert "Revert "App sidebar [2/2]"""

This reverts commit 74785105a9492388fa85f493ac20654ffb205ad9.