Merge "Fix preferences v14 issues in lock screeen setup"