[automerger skipped] Merge "Fixes usage of WallpaperManager to make it optional." into qt-qpr1-dev am: 659f477f65
am:5c9f648edd-s ours am skip reason: change_id I88946f92ff54e556d289c41c28e22da3a4b8c8b8 with SHA134a861add1is in history Change-Id: I73352c6ab78be950a531a526c81b022bd92d3154
This commit is contained in: