Merge "Skip useInvalidatedAuthBoundKey if no secure lock feature."