Merge "Remove color extraction from popup arrow, add shadows." into sc-dev