Merge "Update focus indicator radius to match workspace drag indicator radius." into main