SubWindowWithUndefinedHeight TB2 -> TB4

Change-Id: Ib4dcb7519e3271de80bf9cd531c2d31030228494