Merge "Account for the focused window before requesting input consumer focus" into sc-dev