Merge "Fix 2448345: Fix tactile feedback bug in password/PIN and pattern unlock."