Merge "Fix memory leaks in Settings" into pi-dev
am: be13e74deb

Change-Id: I51e9c6682a0589afbdfcc8799b10598eac496396