Merge "Set wallpaper to invisible only if it is not visible-requested" into sc-dev