am 069e810c: Merge "Fixing memory leak in PreferenceScreen."

* commit '069e810c6a5efc0b33fbe8c29a2d11f7c342a4d8':
  Fixing memory leak in PreferenceScreen.