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

Change-Id: Iab570d7d755d56637c337d8b64b5a0f752fa9c09