am cbbed7ce: am f2d0cac8: Fix crash in settings when hitting up

* commit 'cbbed7cec1177580c08b4439b26892bebed9911f':
  Fix crash in settings when hitting up