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

Change-Id: Idb3da3163bd536668e5705f85217e563dac5208f