Merge "Compute Wallpaper scaling on the server" into rvc-dev am: bed09965dd am: d54c0b0d82

Change-Id: Ica9918468f08bfe8c960855c6321dd9961072401