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