Issue #4 also fixed for AppBarToggleButton