Merge "Check for mSurfaceController in setWallpaperPositionAndScale" into rvc-dev am: c45de5abfa am: 0a164a4b19

Change-Id: Ifaf44da5c2eb6503de281054697ff3c441c14e92