Merge "Drag favorite to remove" am: 82a8baba99 am: bc875c635a
am: 5303a1b6d5

Change-Id: I0186a0b9ecdd1c1317ac8b9167cb4ec0b1a3d350