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

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