Merge "Use correct choose lock password/pattern subtitles" into sc-dev