Samsung check moved to broadcast handler