Merge "[Divider] Allow divider drag handle overlay on primary container" into main