[automerger skipped] Merge "Fix non responding slice toggling" into qt-qpr1-dev am: 80972abd63
am: f161823c01 -s ours
am skip reason: change_id Iff724ce5f6a1e6a7d9ca85b8ce76539a72e72964 with SHA1 ddf6cefcac is in history

Change-Id: I5e0277e26f09661cfca2cd5228244f25de06aa30