[automerger skipped] Merge "Fix race condition while WallpaperMS rebinding...

[automerger skipped] Merge "Fix race condition while WallpaperMS rebinding service." into qt-qpr1-dev am: 98b1ddfa -s ours am: 697e5a62 -s ours am: afa3e647 -s ours am: bc73d99f -s ours am: fea03c41 -s ours am: 201b54f2 -s ours

am skip reason: Change-Id I3adec66de8ac0c7efc9ad3ffbf604b01eacb5720 with SHA-1 b6cd9c20 is in history

Change-Id: I64deb5667d2bc51b97261158ee1f75a3c7fb524e