Merge "Reattach LauncherAppWidgetHostView to its parent after canceling drag" into sc-dev