Merge "Defer sending of ACTION_CHARGING"