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

* commit 'd0383e37bdd7fe909ee4dc0477c73a7342aa7e4e':
  Switch settings provider to use the new Settings icon