Merge "isUserInLockDown can be true when there are other strong auth requirements" into tm-dev