Merge "Changing the taskAffinity for LockScreenRecentsActivity so that other activities do not get started in this task" into ub-launcher3-master