Merge "Fix non responding slice toggling"