Push notification fixes for android.