Merge "Fixing an issue with leaking starting windows. (Bug 17657878)" into lmp-dev