Settings: Fix derps by latest commits

Change-Id: I6b1f75ec23bad79e398c9041656ccd9236310cb7