Merge "Fix system circular wait during top display focus change"