Merge "Correctly handle TargetAccessibilityFocus flag" into sc-dev