Merge "Prevent crash in AppWidgetHost that can be triggered by an AppWidget" into jb-dev