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

Change-Id: I70da049c0efd0f14ae8521a7b505c7294dd5758d