Merge "Do not restart activity when pinned set changes - just re-sort."