Merge "DO NOT MERGE: Fix temporary black after setting a new image wallpaper" into sc-qpr1-dev