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

Change-Id: I5108b9cf5a5df669c861b895b05572d427b58e94