Merge "Fix z-order of displays when adjusting position of stack"