Merge "Adding indirection for preference icon size" into qt-dev
am: 0f0a12cc44

Change-Id: I5fa925789207165f99948dd6ce3c923c909cf8da