Merge "Restore barMode and wallpaperVisible to Taskbar NavbarButtonsViewController state" into main