Fix leaked Window

Change-Id: I4dcfb94a3a7062fed3f3715fcfaa3f1572a59902
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>