Merge "Wallpaper preview surface layering" into ub-launcher3-master