Merge "Check wifi feature before starting wifi service"