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 am: 56b594b6
Change-Id: I27b96b7680107a63d1495617d1fd6b4e199c6580