Merge "Ensure correct window ordering." into klp-dev