Merge "Fixing NPE in LauncherAppWidgetHostView, issue 5270711"