Using the same broadcast handler, fixed issue of pending intents losing
extras