Merge "Fix SetupChooseLockPasswordTest" into tm-dev