Merge "Move display order of focused stack to top when updating focus"