Merge "Fix leak of WeakReferences on mThemeRefs list." into pi-dev
am: 7790f2a4e1

Change-Id: Ia6d0946520165519c2256ab0714a216ac495d45f