Merge "Fix non responding slice toggling problem." into qt-qpr1-dev am: 5956f903cb
am: e87289bbc4

Change-Id: I7cea63639e03070d6aee1eeaf82214bc5f4328b6