Fix leaked window

Change-Id: Ic003707a47164bfc96f0481c94e8a991171c9c67
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>
Merge "Fix leaked window" into pac-4.4