Merge "Merge "Compute Wallpaper scaling on the server" into rvc-dev am: bed09965 am: 2183378e" into rvc-d1-dev-plus-aosp