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

Change-Id: Id9833c0dcbae09ccc4b86e46ded8b35247553b82