Samsung security + death fix & upstream sync