Merge "Support customizing icon color for externally items." into pi-dev