Merge "updated notificiaton expand button hover states" into main