Merge "Update "none selected" state to align with mocks:" into main