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

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

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