Merge "Update misc settingslib icons" into pi-dev am: ee555d5f90
am: 2f8f73e98c

Change-Id: I1db25982e492ae94c5d950bb030af5e0bf1569c3