am cb744d21: merge in klp-release (no-op)

* commit 'cb744d211c3271e4d76dfdb4c0f126921ca56f70':
  Fix NPE trying to enable/disable removed preference.