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

Change-Id: I33c5112c21f2a2326c4d796babdf64eb72cea2db