Merge "2D Recents: use a different background color for drop targets" into nyc-mr2-dev
am: 81e8bdd420

Change-Id: I74ca6532c4aa223fc7f5e80532dd0a261c9f4bba