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

Change-Id: I2235eeb55d9ebcaaac399956d854471779c23b31