Merge "Reset mCurrentUserId when fingerprintd died"