9e94793b24
This way we always start tracking the window when the system tells us to, if we're not already. Change-Id: Id9c1f0d9672f43d877f114839b1489a83ac713ef