Merge "Allow 3 variants of icon size in TwoTargetPreference." into pi-dev am: e5b621a6af
am: 873f1e9681

Change-Id: I80635da2801b14bfc30065de8ec7be7f666f5754