Merge "Account for wallpaper scale in prepareSurfaceLocked" into rvc-dev