Merge "Remove two-button overlay from default overlays"