am 564e8e6f: Merge "Ensure correct window ordering." into klp-dev

* commit '564e8e6f548951c9fe5825aaad327b9ffbeece82':
  Ensure correct window ordering.