Merge changes I3610bfef,I7b898f21,I32ab03b1

* changes:
  Superficial improvements to ZOrderingTest.
  Ensure docked divider is below always-on-top stacks.
  Restore old stack Z ordering promotion.