Merge "Update string and button choice in PS lock setup screen" into main