* Revert "Fix custom top bar from disappearing after a push (#3109)" This reverts commit 0e11b95f85. * Revert "Fixes NPE when initializing twice (#3128)" This reverts commit 0bf0751f5d.