Support non-disposed render in tests am: d84e1ead52 am: 2d583ba667

Change-Id: I6e4180b17e6281da017f95f317390cf80fa95fee