Merge "FocusResolver: Clean up focus requests and results when a display is removed" into sc-dev