Merge "Don't index the ChooseLockGeneric screen" into lmp-dev