Some drag and drop code refactor:
am: 94b510cc68

Change-Id: I2e6e8eaf8c972a6261ec54c322753a1c76f8bc95