Merge "Lock mSurfaceHolder=null in ImageWallpaper" into main