Merge "Reset freezing flag when window is no longer freezing screen"