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

Change-Id: I34e59be8c753ee25b5be46a8ce76a680a7da24ca