Merge "Restored hover states for notifications" into main