Merge "Update more lock screen settings string" into main