[automerger skipped] Merge "Fix potential NPE while releasing worker thread of...

[automerger skipped] Merge "Fix potential NPE while releasing worker thread of ImageWallpaper" into qt-qpr1-dev am: 85fc58ae -s ours am: 8f267e43 -s ours am: 65090959 -s ours am: 55ccfe08 -s ours am: 0bea35d1 -s ours

am skip reason: Change-Id I243274af54538fc89268c448aa2c5a95f63c7ae3 with SHA-1 4e404406 is in history

Change-Id: I51d98dce04fed33cf326de8f95c9c2517ac2e903