fix gcm batching
fix google push logic