Merge "Load Smart Select stroke color from colorControlActivated"