fix #2337 NPE in cache list when leaving activity early
Merge remote-tracking branch 'origin/release'