Merge "Use METHOD_ALERT instead of METHOD_DEFAULT for reminders" into froyo