replace setting null preference with removeValue

@dinhviethoa