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

Change-Id: Ia626ee1d5975ead16e5fe487d8b35ccbfde39443