Merge "Dismiss keyguard on udfps touch if can dismiss LS" into sc-dev