Merge "Match rect selected color to theme." into main