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

Change-Id: I406d03017484aa5a2d701d27df1f96421ef33701