Merge "Fix a bug where dropping on Root never works." into arc-apps
am: 08a92ee6d8

Change-Id: Ica1dd34a75cef3c162bf4b8ac55c43e3c275e214