Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev