Merge "Fixes memory leak and NPE crash issue (2/3)." into tm-qpr-dev am: cc51e1bf43

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/20920223

Change-Id: I35bcd89c4e287100b227d1971a52bd7bae95e106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>