Merge "Use updated lockscreen validation API in Settings." into udc-dev