am e0388230: am 14136c7c: Merge "Settings: Fix the memory leak in Settings"

* commit 'e0388230768168af31c26507b5889985daa93169':
  Settings: Fix the memory leak in Settings