Merge "Check for mSurfaceController in setWallpaperPositionAndScale" into rvc-dev