am c8ba2e87: Merge "Place window at top when adding by base layer" into lmp-mr1-dev

* commit 'c8ba2e87a40eb70ad22c62b9768e7691e3ff3bc3':
  Place window at top when adding by base layer