Merge "Changes to biometric sensor interface in lockscreen" into jb-dev