Merge "Update drawable per UX spec without dashed segments." into main