Merge "Merge "Account for wallpaper scale in prepareSurfaceLocked" into...
Merge "Merge "Account for wallpaper scale in prepareSurfaceLocked" into rvc-dev am: 661d4706" into rvc-dev-plus-aosp am: f5922606
Change-Id: Ife5451f98272ed766ae13f89ddb637c9ef8abd56