am acf9b611: am a9ceea4f: Merge "Fix up-back for Settings." into jb-dev

* commit 'acf9b61117bbc606dc85ce37afa0ef3d90c4d900':
  Fix up-back for Settings.