Merge "TIAF: handle surface and surface view"