Revert "cleanup theme merge"

This reverts commit 3a1fc2b2f301d3cf1c9f88776ba80f2aec290fe8.
Revert "Fix setting confirmation helper derp"

This reverts commit d998993530783fe7e5e34f981b1c2803367d2183.
Revert "Add on-the-spot user preference dialog"

This reverts commit 5e67b906627f7a366b4ae4120f56d19e0a1dc395.
Revert "SystemUI: Swipe to float for notifications and recents (Part2)"

This reverts commit ffcade34fbc50558164e1ae7f4ef8df1efd041d1.
Revert "SystemUI: Extend swipe helper (Part1)"

This reverts commit 1cc82f9d9539bb55ca5132ea9bb7d97a25156cb0.
Revert "clean up some more"

This reverts commit 13148a2c9429d9ec1eb940701fd9fdfa5e5b4169.