Merge "Remove starting window whenever the acitvity is stopped" into nyc-dev