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

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