Merge "Revert "Use color extraction for arrow popup."" into sc-dev