Merge "Add a method in TIS to relayout SurfaceView" into lmp-dev