Merge "Fix non responding slice toggling" into qt-qpr1-dev
am: 80972abd63

Change-Id: I7c1afdf75d554d26c9c78e60d3f3affd93229791