Samsung Note 7 will be making a come back.