Merge "Replace SurfaceViews across resize trigerred relaunches."