[automerger skipped] Merge "Do not restart activity when pinned set changes - just re-sort." into qt-qpr1-dev am: 0416784c2e am: d7c79c3a2c -s ours
am skip reason: Change-Id I6e9e03b77e1486093097ea1488fa589e3c7bd482 with SHA-1 bc29081628 is in history

Change-Id: I4065e4068ad0460e95582193893bb09efc49181c