[automerger] Fixing launcher going to a different state when dragging an icon from different activity am: 4dcda06542

Change-Id: Ifcb89488c351ba866026cfbdf3645b4358eeac8f