Merge "Setting alternate_expand_target to not be focusable" into main