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

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