Merge "Removed duplicate title in SetupChooseLock" into main