Merge change 22673 into eclair

* changes:
  Make SINGLE_TOP work with CLEAR_TOP.