Revert "Revert "SysUI:  NavBar & Widgets rollup [1/2?]""

This reverts commit 62c2118924c8bcfa2bd22ff2d9efeb3c17acec6c.