Merge "Distinguish between bringing stack to front and delivering to top." into pi-dev