Revert "[PARTIAL] Support theming navbar separately from SystemUI"

This reverts commit fd2254c4b82b37f38a57c6e5d5683e84dd36a423.
Revert "Revert "fix build maybe""

This reverts commit 30b75929bd1c11f527663fcf868ea3343598911a.