Merge "Fix Throttle Notification intents" into froyo