Merge "Set the height of the right_icon in addition to the width" into sc-dev