Merge "Excluding ChooseLockGeneric from recents"