Merge "Fix footer-notif overlap after inline reply" into main