Merge "Ensure SurfaceView requests WM relayout when size changes."