Merge "Fix fingerprint on lockscreen preivew" into udc-dev