am d0383e37: am 4d0f0692: Merge "Switch settings provider to use the new...
am d0383e37: am 4d0f0692: Merge "Switch settings provider to use the new Settings icon" into klp-dev
* commit 'd0383e37':
Switch settings provider to use the new Settings icon