Merge "Separating out Launcher3 resources from Wallpaper resources" into ub-launcher3-calgary