Improve Android support and notifications.