Merge "[Notif redesign] Swap history and settings buttons" into main