Merge "Waiting for Launcher stop when dropping a widget that starts an activity" into main