Merge "Allow populating left_icon independently of right_icon." into sc-dev