Merge "Drag favorite to remove"
am: 82a8baba99

Change-Id: I9e2c2ba2f7a3dd3f2e2534a618a54d852ed8da35