Merge "Fixed background color of folder on drag/drop hover state." into arc-apps
am: b5005daa7f

Change-Id: I1a108ce864839ef6cf6364ef2674003b1c8106b7