Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev